public class Test {
    public static void main(String[] args) {
        System.out.println("hello git");
        System.out.println("xxxx");
        System.out.println("xxxx");
        System.out.println("xxxx");
        System.out.println("xxxx");
        System.out.println("master修改代码");
        System.out.println("我就想冲突");
        System.out.println("再次修改升级");
        System.out.println("再次修改升级");
    }
}
